Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move SetMiddlewareEnabled call ordering (backport #2283) #2371

Merged
merged 9 commits into from
Sep 28, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 23, 2022

This is an automatic backport of pull request #2283 done by Mergify.
Cherry-pick of 25d62f0 has failed:

On branch mergify/bp/release/v6.0.x/pr-2283
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit 25d62f0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/27-interchain-accounts/controller/keeper/account.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 25d62f0)

# Conflicts:
#	modules/apps/27-interchain-accounts/controller/keeper/account.go
@lgtm-com
Copy link

lgtm-com bot commented Sep 23, 2022

This pull request introduces 2 alerts when merging 63cb1a6 into ffb7f8b - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable
  • 1 for Unreachable statement

@chatton
Copy link
Contributor

chatton commented Sep 23, 2022

depends on this

@lgtm-com
Copy link

lgtm-com bot commented Sep 23, 2022

This pull request introduces 2 alerts when merging 7b53a4d into ffb7f8b - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable
  • 1 for Unreachable statement

@crodriguezvega crodriguezvega merged commit bd3f122 into release/v6.0.x Sep 28, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v6.0.x/pr-2283 branch September 28, 2022 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants